From: Philip Withnall <withnall@endlessm.com>
Date: Mon, 11 Sep 2017 08:26:52 +0000 (+0100)
Subject: gtknotebook: Simplify some if-conditions
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~180
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4b88560feb9e87a7e07c220df23291876cba0ffa;p=gtk%2B3.0.git

gtknotebook: Simplify some if-conditions

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=787303
---

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 56b601dfc1..747dbd7943 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -5952,8 +5952,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook          *notebook,
         {
         case GTK_POS_TOP:
         case GTK_POS_BOTTOM:
-          if (priv->operation != DRAG_OPERATION_REORDER ||
-              (priv->operation == DRAG_OPERATION_REORDER && page != priv->cur_page))
+          if (priv->operation != DRAG_OPERATION_REORDER || page != priv->cur_page)
             {
               if (priv->operation == DRAG_OPERATION_REORDER)
                 {
@@ -5974,8 +5973,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook          *notebook,
           break;
         case GTK_POS_LEFT:
         case GTK_POS_RIGHT:
-          if (priv->operation != DRAG_OPERATION_REORDER  ||
-              (priv->operation == DRAG_OPERATION_REORDER && page != priv->cur_page))
+          if (priv->operation != DRAG_OPERATION_REORDER || page != priv->cur_page)
             {
               if (priv->operation == DRAG_OPERATION_REORDER)
                 {